Don't load scroll-bar unless x-toolkit-scroll-bars-p

is bound.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 06942f25bfd5b93e219ade6d8af75e41b6ef5f81..86122146a6ebc96cfd83ca9105a2edfd69c96cad 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -102,7 +102,8 @@
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
-      (load "scroll-bar")
+      (and (boundp 'x-toolkit-scroll-bars-p)
+          (load "scroll-bar"))
       (load "select")))
 
 (message "%s" (garbage-collect))